document gtk_binding_entry_skip().

Wed Oct 11 14:31:30 2006  Tim Janik  <timj@imendio.com>

        * docs/reference/gtk/gtk-sections.txt:
        * gtk/gtkbindings.c: document gtk_binding_entry_skip().

diff --git a/ChangeLog b/ChangeLog
index 851f5b4ffe6d6169f7b60dc80c74d345104c9880..2ee7c2b2e56e13bcca9b413219ff3ad29ae9241d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 11 14:31:30 2006  Tim Janik  <timj@imendio.com>
+
+       * docs/reference/gtk/gtk-sections.txt:
+       * gtk/gtkbindings.c: document gtk_binding_entry_skip().
+
 2006-10-11  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtk.symbols: Remove gtk_combo_string_key, which is a static

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 3ef83d79e42d8caf4cf57195a824ecfdaabe72a3..2e977da42bb582787bcaadbf8f42ff1a19d31855 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -5796,13 +5796,10 @@ gtk_binding_set_find
 gtk_bindings_activate
 gtk_bindings_activate_event
 gtk_binding_set_activate
-gtk_binding_entry_add
-gtk_binding_entry_clear
 gtk_binding_entry_add_signal
-gtk_binding_set_add_path
+gtk_binding_entry_skip
 gtk_binding_entry_remove
-gtk_binding_entry_add_signall
-gtk_binding_parse_binding
+gtk_binding_set_add_path
 </SECTION>
 
 <SECTION>

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 5a8e625b8c4dc505c88ece8d269b3a597e4e1071..49d4376315cc968bd3acd761eb84f1687d96e7ad 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1858,6 +1858,40 @@ get an array of #GtkArgs that this object accepts.
 @n_args_p: the number of arguments this object accepts.
 @Returns: the array of arguments (or NULL on error).
 
+<!-- ##### MACRO gtk_binding_entry_add ##### -->
+<para>
+Deprecated.
+</para>
+
+
+<!-- ##### FUNCTION gtk_binding_entry_add_signall ##### -->
+<para>
+
+</para>
+
+@binding_set: 
+@keyval: 
+@modifiers: 
+@signal_name: 
+@binding_args: 
+
+<!-- ##### FUNCTION gtk_binding_entry_clear ##### -->
+<para>
+
+</para>
+
+@binding_set: 
+@keyval: 
+@modifiers: 
+
+<!-- ##### FUNCTION gtk_binding_parse_binding ##### -->
+<para>
+
+</para>
+
+@scanner: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_button_box_child_requisition ##### -->
 <para>\r
 This is an internally used function and should never be called from an\r

diff --git a/docs/reference/gtk/tmpl/gtkbindings.sgml b/docs/reference/gtk/tmpl/gtkbindings.sgml
index a5d9447df1eae5fdbe9b4dbe55e6e81dd77a6e34..b282cfff068c00dde0bc1cc794814381f4b33791 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkbindings.sgml
+++ b/docs/reference/gtk/tmpl/gtkbindings.sgml
@@ -141,8 +141,9 @@ Each key binding element of a binding sets binding list is represented by a #Gtk
 @binding_set:  binding set this entry belongs to
 @destroyed:    implementation detail
 @in_emission:  implementation detail
+@marks_unbound: 
 @set_next:     linked list of entries maintained by binding set
-@hash_next:    implementation detail
+@hash_next:    implementation detail
 @signals:      action signals of this entry
 
 <!-- ##### STRUCT GtkBindingSignal ##### -->
@@ -164,6 +165,43 @@ key binding signal emission as stored in #GtkBindingSignal.
 
 @arg_type: implementation detail
 
+<!-- ##### FUNCTION gtk_binding_set_new ##### -->
+<para>
+
+</para>
+
+@set_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_binding_set_by_class ##### -->
+<para>
+
+</para>
+
+@object_class: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_binding_set_find ##### -->
+<para>
+
+</para>
+
+@set_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_bindings_activate ##### -->
+<para>
+
+</para>
+
+@object: 
+@keyval: 
+@modifiers: 
+@Returns: 
+
 
 <!-- ##### FUNCTION gtk_bindings_activate_event ##### -->
 <para>
@@ -175,7 +213,59 @@ key binding signal emission as stored in #GtkBindingSignal.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_binding_entry_add ##### -->
+<!-- ##### FUNCTION gtk_binding_set_activate ##### -->
+<para>
+
+</para>
+
+@binding_set: 
+@keyval: 
+@modifiers: 
+@object: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_binding_entry_add_signal ##### -->
 <para>
-Deprecated.
+
 </para>
+
+@binding_set: 
+@keyval: 
+@modifiers: 
+@signal_name: 
+@n_args: 
+@Varargs: 
+
+
+<!-- ##### FUNCTION gtk_binding_entry_skip ##### -->
+<para>
+
+</para>
+
+@binding_set: 
+@keyval: 
+@modifiers: 
+
+
+<!-- ##### FUNCTION gtk_binding_entry_remove ##### -->
+<para>
+
+</para>
+
+@binding_set: 
+@keyval: 
+@modifiers: 
+
+
+<!-- ##### FUNCTION gtk_binding_set_add_path ##### -->
+<para>
+
+</para>
+
+@binding_set: 
+@path_type: 
+@path_pattern: 
+@priority: 
+
+

diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 24009cd509e1ffdb4b5f80459c6cfa09ea49bb94..0cfd2710a6140a845f44f2e7f88651722d129908 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -814,6 +814,7 @@ specific portions of a RC file.
 @GTK_RC_TOKEN_LTR: 
 @GTK_RC_TOKEN_RTL: 
 @GTK_RC_TOKEN_COLOR: 
+@GTK_RC_TOKEN_UNBIND: 
 @GTK_RC_TOKEN_LAST: 
 
 <!-- ##### FUNCTION gtk_rc_scanner_new ##### -->

diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index c8f494790b2500564c413eab37ab36ae300821a0..838cefffacc5ebac3d0f000dd859886735da6e82 100644 (file)
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -722,6 +722,10 @@ gtk_binding_entry_clear (GtkBindingSet     *binding_set,
  * @modifiers:   key modifier of binding to skip
  *
  * Since: 2.12
+ *
+ * Install a binding on @binding_set which causes key lookups
+ * to be aborted, to prevent bindings from lower priority sets
+ * to be activated.
  **/
 void
 gtk_binding_entry_skip (GtkBindingSet  *binding_set,